Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up DISTFILES #3346

Merged

Conversation

ann0see
Copy link
Member

@ann0see ann0see commented Aug 10, 2024

Short description of changes

Removes and adds references to removed/moved files in Jamulus.pro
CHANGELOG: SKIP

Context: Fixes an issue?

Fixes: #3345

Does this change need documentation? What needs to be documented and how?

No
Status of this Pull Request

make dist was tested by @softins
What is missing until this pull request can be merged?

Review

Checklist

  • I've verified that this Pull Request follows the general code principles
  • I tested my code and it does what I want
  • My code follows the style guide
  • I waited some time after this Pull Request was opened and all GitHub checks completed without errors.
  • I've filled all the content above

Copy link
Member

@softins softins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yes, I forgot about that reference. Good catch.

Copy link
Member

@softins softins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, make dist throws up some other errors too, which are probably additional obsolete filenames:

cp: cannot stat 'src/res/CLEDBlack.png': No such file or directory
cp: cannot stat 'src/res/CLEDDisabledSmall.png': No such file or directory
cp: cannot stat 'src/res/CLEDGreen.png': No such file or directory
cp: cannot stat 'src/res/CLEDGreySmall.png': No such file or directory
cp: cannot stat 'src/res/CLEDRed.png': No such file or directory
cp: cannot stat 'src/res/CLEDYellow.png': No such file or directory
cp: cannot stat 'src/res/LEDBlackSmall.png': No such file or directory
cp: cannot stat 'src/res/LEDGreenSmall.png': No such file or directory
cp: cannot stat 'src/res/LEDRedSmall.png': No such file or directory
cp: cannot stat 'src/res/LEDYellowSmall.png': No such file or directory
cp: cannot stat 'src/res/HLEDGreenSmall.png': No such file or directory
cp: cannot stat 'src/res/HLEDBlackSmall.png': No such file or directory
cp: cannot stat 'src/res/HLEDRedSmall.png': No such file or directory
cp: cannot stat 'src/res/HLEDYellowSmall.png': No such file or directory
cp: cannot stat 'libs/opus/INSTALL': No such file or directory
make[1]: *** [Makefile.Release:1163: distdir] Error 1
make[1]: Leaving directory '/home/tony/jamulus'
make: *** [Makefile:299: release-distdir] Error 2

@softins
Copy link
Member

softins commented Aug 13, 2024

Actually, make dist throws up some other errors too, which are probably additional obsolete filenames:

Looks like at least some of them date from 7e75842. I'll check the list from scratch.

Remove refrences to files that no longer exist.
Add new resource files that were missing from the list.
@softins
Copy link
Member

softins commented Aug 13, 2024

I've pushed an update that removes obsolete filenames from the list and adds some that were missing. make dist now works, although I'm not sure how useful the produced tarball is nowadays.

We should update the PR title/description to reflect the wider scope of the changes.

@ann0see ann0see changed the title Remove reference to legacy plist file Clean up DISTFILES Aug 13, 2024
@ann0see
Copy link
Member Author

ann0see commented Aug 13, 2024

Thanks.

@ann0see ann0see added this to the Release 3.12.0 milestone Aug 19, 2024
@softins
Copy link
Member

softins commented Aug 22, 2024

Why is this 3.12.0 and not 3.11.0? Given that it's fixing something that's incorrect, and doesn't affect the application code or translations.

@ann0see
Copy link
Member Author

ann0see commented Aug 23, 2024

We're just conservative on tagging things after freeze.

@ann0see
Copy link
Member Author

ann0see commented Aug 23, 2024

Anyway, retagged

@ann0see ann0see requested a review from pljones August 23, 2024 20:45
@ann0see ann0see merged commit 6f4ddfa into jamulussoftware:main Aug 24, 2024
12 checks passed
@ann0see ann0see deleted the refactoring/removeLegacyReference branch August 24, 2024 10:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Clean up DISTFILES in Jamulus.pro
3 participants